Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix part of #4391: Fix failing build on m1 macs #5111

Merged
merged 8 commits into from
Aug 3, 2023

Conversation

kkmurerwa
Copy link
Collaborator

@kkmurerwa kkmurerwa commented Jul 29, 2023

Fix part of #4391 : Fix failing build on M1 Macs

Explanation

Some M1 Macs fail to build the Oppia app because of unused imports in some of the proto files in the project. This PR attempts to fix this issue by removing unused imports in proto files. Files affected by this fix are;

  • profile.proto
  • deprecation.proto

This is a temporary fix and more investigation will need to be done to properly understand why this behavior is erratic and why it only happens in some instances and not in others. More checks are also needed to ensure that proto files only have imports that are used in the proto file before they are merged.

Besides build fixes, this PR also;

  • Includes a fix for the buildifier_download.sh which previously did not work for MacOS users.
  • Introduces a static_checks.sh file to allow contributors to run all static checks locally before pushing the code to Git.
  • Adds a wiki entry in the Static-Analysis-Checks wiki. The entry contains instructions on how to run static checks locally with the static_checks.sh file.

Essential Checklist

  • The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • Any changes to scripts/assets files have their rationale included in the PR explanation.
  • The PR follows the style guide.
  • The PR does not contain any unnecessary code changes from Android Studio (reference).
  • The PR is made from a branch that's not called "develop" and is up-to-date with "develop".
  • The PR is assigned to the appropriate reviewers (reference).

@kkmurerwa kkmurerwa requested a review from a team as a code owner July 29, 2023 08:10
@kkmurerwa kkmurerwa requested a review from a team as a code owner July 29, 2023 15:38
Copy link
Collaborator

@adhiamboperes adhiamboperes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @kkmurerwa! This PR LGTM. Just one thing: could you change both the title and description to "Fix Part of"? Otherwise the issue will be closed, yet it is not fully resolved.

scripts/static_checks.sh Show resolved Hide resolved
@oppiabot
Copy link

oppiabot bot commented Jul 31, 2023

Unassigning @adhiamboperes since they have already approved the PR.

@adhiamboperes
Copy link
Collaborator

One more thing, please refer to #5108 (comment) on how to fix your failing TODO check.

scripts/static_checks.sh Outdated Show resolved Hide resolved
scripts/static_checks.sh Show resolved Hide resolved
@seanlip seanlip assigned kkmurerwa and unassigned seanlip Jul 31, 2023
@kkmurerwa kkmurerwa changed the title Fix #4391: Fix failing build on m1 macs Fix part of #4391: Fix failing build on m1 macs Aug 1, 2023
@kkmurerwa kkmurerwa assigned seanlip and adhiamboperes and unassigned kkmurerwa Aug 3, 2023
@kkmurerwa
Copy link
Collaborator Author

Hi @seanlip. This is PR ready for another pass.

Copy link
Member

@seanlip seanlip left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great. Thanks @kkmurerwa!

@seanlip seanlip assigned kkmurerwa and adhiamboperes and unassigned seanlip Aug 3, 2023
@oppiabot oppiabot bot added the PR: LGTM label Aug 3, 2023
@oppiabot
Copy link

oppiabot bot commented Aug 3, 2023

Hi @kkmurerwa, this PR is ready to be merged. Please address any remaining comments prior to merging, and feel free to ask someone to merge your PR once the CI checks pass and you're happy with it. Thanks!

Copy link
Collaborator

@adhiamboperes adhiamboperes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @kkmurerwa, this LGTM

@adhiamboperes adhiamboperes enabled auto-merge (squash) August 3, 2023 14:02
@oppiabot
Copy link

oppiabot bot commented Aug 3, 2023

Unassigning @adhiamboperes since they have already approved the PR.

@oppiabot
Copy link

oppiabot bot commented Aug 3, 2023

Hi @kkmurerwa, this PR is ready to be merged. Please address any remaining comments prior to merging, and feel free to ask someone to merge your PR once the CI checks pass and you're happy with it. Thanks!

@adhiamboperes adhiamboperes merged commit d55b7e6 into oppia:develop Aug 3, 2023
40 checks passed
@kkmurerwa kkmurerwa deleted the fix-failing-build-on-m1-macs branch November 1, 2023 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

4 participants